Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import groovy.json.JsonSlurper

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

ext {
testpressSDK = '1.3.95'
Expand Down Expand Up @@ -66,6 +68,11 @@ dependencies {
testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'

//VIEW MODEL - LIVE DATA
implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0"
implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.2.0"

}

def key_alias = "sample"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.HashMap;

import in.testpress.course.network.Resource;
import in.testpress.testpress.models.AuthToken;
import in.testpress.testpress.models.ProfileDetails;
import in.testpress.testpress.models.RegistrationSuccessResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.List;
import java.util.Map;

import in.testpress.course.network.Resource;
import in.testpress.exam.models.Vote;
import in.testpress.testpress.models.Category;
import in.testpress.testpress.models.CheckPermission;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package `in`.testpress.testpress.network

import `in`.testpress.testpress.TestpressServiceProvider
import `in`.testpress.testpress.models.ProfileDetails
import `in`.testpress.testpress.util.SafeAsyncTask
import android.app.Activity
import androidx.lifecycle.MutableLiveData

class ProfileDetailRepository(val serviceProvider: TestpressServiceProvider, val activity: Activity) {

var profileDetails = MutableLiveData<ProfileDetails?>()

fun get(): MutableLiveData<ProfileDetails?> {
object : SafeAsyncTask<ProfileDetails>() {
override fun call(): ProfileDetails {
return serviceProvider.getService(activity).profileDetails
}

override fun onSuccess(resource: ProfileDetails) {
profileDetails.postValue(resource)
}

override fun onException(exception: Exception) {
profileDetails.postValue(null)
}
}.execute()
return profileDetails
}
}
57 changes: 39 additions & 18 deletions app/src/main/java/in/testpress/testpress/ui/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,36 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.GravityCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;

import android.os.Handler;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.GridView;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;

import androidx.viewpager.widget.ViewPager;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.material.navigation.NavigationView;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import javax.inject.Inject;

import butterknife.ButterKnife;
import butterknife.InjectView;
import in.testpress.core.TestpressSdk;
import in.testpress.core.TestpressSession;
import in.testpress.course.TestpressCourse;
import in.testpress.course.fragments.DownloadsFragment;
import in.testpress.exam.ui.view.NonSwipeableViewPager;
Expand All @@ -71,7 +64,6 @@
import in.testpress.testpress.util.UIUtils;
import in.testpress.testpress.util.UpdateAppDialogManager;
import io.sentry.android.core.SentryAndroid;

import static in.testpress.testpress.BuildConfig.ALLOW_ANONYMOUS_USER;
import static in.testpress.testpress.BuildConfig.APPLICATION_ID;
import static in.testpress.testpress.BuildConfig.BASE_URL;
Expand Down Expand Up @@ -100,6 +92,11 @@ public class MainActivity extends TestpressFragmentActivity {
DrawerLayout drawer;
@InjectView(R.id.navigation_view)
NavigationView navigationView;
ConstraintLayout navigationHeader;
ImageView settingsImage;
TextView username;
TextView displayName;
ImageView profileImage;

private ActionBarDrawerToggle drawerToggle;
private int mSelectedItem;
Expand Down Expand Up @@ -137,7 +134,9 @@ protected void onCreate(final Bundle savedInstanceState) {
} else {
checkUpdate();
}
initializeNavigationHeader();
setupEasterEgg();
setOnClickListener();
}

@Override
Expand All @@ -157,7 +156,6 @@ private void setupEasterEgg() {
rateUsButton.setActionView(button);
rateUsButton.getActionView().setVisibility(View.GONE);


findViewById(R.id.version_info).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
Expand Down Expand Up @@ -186,6 +184,29 @@ public boolean onLongClick(View view) {
});
}

private void initializeNavigationHeader() {
View headerView = navigationView.getHeaderView(0);
navigationHeader = headerView.findViewById(R.id.navigation_header_container);
username = headerView.findViewById(R.id.userName);
displayName = headerView.findViewById(R.id.displayName);
profileImage = headerView.findViewById(R.id.profileImage);
settingsImage = headerView.findViewById(R.id.settingsImage);
}

private void setOnClickListener() {
settingsImage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
navigateToProfileDetailsActivity();
}
});
}

private void navigateToProfileDetailsActivity() {
Intent intent = new Intent(this, ProfileDetailsActivity.class);
startActivity(intent);
}

private void setUpNavigationDrawer() {
getSupportActionBar().setHomeButtonEnabled(true);
drawerToggle = setupDrawerToggle();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package `in`.testpress.testpress.ui

import `in`.testpress.testpress.models.ProfileDetails
import `in`.testpress.testpress.network.ProfileDetailRepository
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel

class ProfileDetailsViewModel(private val profileDetailRepository: ProfileDetailRepository) : ViewModel() {

fun get(): MutableLiveData<ProfileDetails?> {
return profileDetailRepository.get()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package `in`.testpress.testpress.util

import `in`.testpress.testpress.TestpressServiceProvider
import `in`.testpress.testpress.network.ProfileDetailRepository
import `in`.testpress.testpress.ui.ProfileDetailsViewModel
import android.app.Activity
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import java.lang.IllegalArgumentException

class ProfileDetailViewModelFactory(private val activity: Activity, val serviceProvider: TestpressServiceProvider): ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(ProfileDetailsViewModel::class.java)) {
return ProfileDetailsViewModel(ProfileDetailRepository(serviceProvider, activity)) as T
}

throw IllegalArgumentException("Wrong Parameters")
}
}
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#999999"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
</vector>
1 change: 1 addition & 0 deletions app/src/main/res/layout/main_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
android:layout_gravity="start"
app:itemTextColor="@color/testpress_black"
android:background="@android:color/white"
app:headerLayout="@layout/navigation_drawer_header"
app:menu="@menu/main_menu" >


Expand Down
78 changes: 78 additions & 0 deletions app/src/main/res/layout/navigation_drawer_header.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools"
android:id="@+id/navigation_header_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="16dp"
android:visibility="gone">

<com.google.android.material.card.MaterialCardView
android:id="@+id/profileImageContainer"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="16dp"
app:cardCornerRadius="50dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="@color/browser_actions_bg_grey"
app:strokeWidth="1dp">

<ImageView
android:id="@+id/profileImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter" />

</com.google.android.material.card.MaterialCardView>

<TextView
android:id="@+id/displayName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="16dp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/profileImageContainer"
tool:text="Display Name" />

<TextView
android:id="@+id/userName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginLeft="20dp"
android:layout_marginBottom="16dp"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/displayName"
app:layout_constraintBottom_toBottomOf="parent"
tool:text="Username" />

<ImageView
android:id="@+id/settingsImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_settings"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/userName"
android:layout_marginRight="16dp" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_color"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/userName" />

</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@
<color name="testpress_vote_indicator">#298cdd</color>
<color name="light_grey">#efefef</color>

<color name="divider_color">#dedede</color>

</resources>
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.31'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down