Initial commit
1
app/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
/build
|
||||
73
app/build.gradle
Normal file
@@ -0,0 +1,73 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
apply plugin: 'kotlin-android'
|
||||
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
//kotlin kapt plugin
|
||||
apply plugin: 'kotlin-kapt'
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
defaultConfig {
|
||||
applicationId "com.example.h_mal.sliidenewsreader"
|
||||
minSdkVersion 26
|
||||
targetSdkVersion 29
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
dataBinding {
|
||||
enabled = true
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
implementation 'androidx.appcompat:appcompat:1.0.2'
|
||||
implementation 'androidx.core:core-ktx:1.0.2'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
||||
implementation 'com.google.android.material:material:1.0.0'
|
||||
implementation 'androidx.annotation:annotation:1.0.2'
|
||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
|
||||
|
||||
//Retrofit and GSON
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
|
||||
|
||||
//Kotlin Coroutines
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
|
||||
|
||||
//New Material Design
|
||||
implementation 'com.google.android.material:material:1.1.0-alpha10'
|
||||
|
||||
//Kodein Dependency Injection
|
||||
implementation "org.kodein.di:kodein-di-generic-jvm:6.2.1"
|
||||
implementation "org.kodein.di:kodein-di-framework-android-x:6.2.1"
|
||||
|
||||
//Android Room
|
||||
implementation "androidx.room:room-runtime:2.2.0-rc01"
|
||||
implementation "androidx.room:room-ktx:2.2.0-rc01"
|
||||
kapt "androidx.room:room-compiler:2.2.0-rc01"
|
||||
|
||||
implementation 'com.xwray:groupie:2.3.0'
|
||||
implementation 'com.xwray:groupie-kotlin-android-extensions:2.3.0'
|
||||
implementation 'com.xwray:groupie-databinding:2.3.0'
|
||||
|
||||
implementation "androidx.preference:preference-ktx:1.1.0"
|
||||
|
||||
//image caching and display library
|
||||
implementation 'com.squareup.picasso:picasso:2.71828'
|
||||
androidTestImplementation 'androidx.test:rules:1.3.0-alpha03'
|
||||
}
|
||||
21
app/proguard-rules.pro
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
||||
@@ -0,0 +1,204 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.login
|
||||
|
||||
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.test.espresso.Espresso.onView
|
||||
import androidx.test.espresso.action.ViewActions.*
|
||||
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
|
||||
import androidx.test.espresso.assertion.ViewAssertions.matches
|
||||
import androidx.test.espresso.matcher.RootMatchers.withDecorView
|
||||
import androidx.test.espresso.matcher.ViewMatchers.*
|
||||
import androidx.test.filters.LargeTest
|
||||
import androidx.test.rule.ActivityTestRule
|
||||
import com.example.h_mal.sliidenewsreader.R
|
||||
import org.hamcrest.CoreMatchers.`is`
|
||||
import org.hamcrest.CoreMatchers.not
|
||||
import org.hamcrest.Description
|
||||
import org.hamcrest.Matcher
|
||||
import org.hamcrest.Matchers.allOf
|
||||
import org.hamcrest.TypeSafeMatcher
|
||||
import org.junit.Before
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
|
||||
|
||||
@LargeTest
|
||||
class LoginActivityTest {
|
||||
|
||||
@Rule
|
||||
@JvmField
|
||||
var mActivityTestRule = ActivityTestRule(LoginActivity::class.java)
|
||||
|
||||
lateinit var invalidTextString: String
|
||||
lateinit var failedTextString: String
|
||||
|
||||
@Before
|
||||
fun setup(){
|
||||
invalidTextString = mActivityTestRule.activity.getString(R.string.login_invalid)
|
||||
failedTextString = mActivityTestRule.activity.getString(R.string.login_failed)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun emptyBothTest() {
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun emptyPasswordTest() {
|
||||
username_edittext.perform(replaceText("user"), closeSoftKeyboard())
|
||||
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun emptyUserNameTest() {
|
||||
password_edittext.perform(replaceText("password"), closeSoftKeyboard())
|
||||
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
fun incorrectDetailsTest() {
|
||||
username_edittext.perform(replaceText("user"), closeSoftKeyboard())
|
||||
password_edittext.perform(replaceText("user"), closeSoftKeyboard())
|
||||
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun validLoginAsUserTest() {
|
||||
username_edittext.perform(replaceText("user"), closeSoftKeyboard())
|
||||
password_edittext.perform(replaceText("password"), closeSoftKeyboard())
|
||||
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(doesNotExist())
|
||||
|
||||
menu_button.perform(click())
|
||||
signout_button.perform(click())
|
||||
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun validLoginAsPremiumUserTest() {
|
||||
username_edittext.perform(replaceText("premium"), closeSoftKeyboard())
|
||||
password_edittext.perform(replaceText("password"), closeSoftKeyboard())
|
||||
|
||||
sign_in_button.perform(click())
|
||||
sign_in_button.check(doesNotExist())
|
||||
|
||||
menu_button.perform(click())
|
||||
signout_button.perform(click())
|
||||
|
||||
sign_in_button.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
private val sign_in_button = onView(
|
||||
allOf(
|
||||
withId(R.id.login), withText("Sign in"),
|
||||
childAtPosition(
|
||||
allOf(
|
||||
withId(R.id.container),
|
||||
childAtPosition(
|
||||
withId(android.R.id.content),
|
||||
0
|
||||
)
|
||||
),
|
||||
2
|
||||
),
|
||||
isDisplayed()
|
||||
)
|
||||
)
|
||||
|
||||
private val username_edittext = onView(
|
||||
allOf(
|
||||
withId(R.id.username),
|
||||
childAtPosition(
|
||||
allOf(
|
||||
withId(R.id.container),
|
||||
childAtPosition(
|
||||
withId(android.R.id.content),
|
||||
0
|
||||
)
|
||||
),
|
||||
0
|
||||
),
|
||||
isDisplayed()
|
||||
)
|
||||
)
|
||||
|
||||
private val password_edittext = onView(
|
||||
allOf(
|
||||
withId(R.id.password),
|
||||
childAtPosition(
|
||||
allOf(
|
||||
withId(R.id.container),
|
||||
childAtPosition(
|
||||
withId(android.R.id.content),
|
||||
0
|
||||
)
|
||||
),
|
||||
1
|
||||
),
|
||||
isDisplayed()
|
||||
)
|
||||
)
|
||||
|
||||
val menu_button = onView(
|
||||
allOf(
|
||||
withContentDescription("More options"),
|
||||
childAtPosition(
|
||||
childAtPosition(
|
||||
withId(R.id.action_bar),
|
||||
1
|
||||
),
|
||||
0
|
||||
),
|
||||
isDisplayed()
|
||||
)
|
||||
)
|
||||
|
||||
val signout_button = onView(
|
||||
allOf(
|
||||
withId(R.id.title), withText("Sign out"),
|
||||
childAtPosition(
|
||||
childAtPosition(
|
||||
withId(R.id.content),
|
||||
0
|
||||
),
|
||||
0
|
||||
),
|
||||
isDisplayed()
|
||||
)
|
||||
)
|
||||
|
||||
private fun testToast(toastText:String){
|
||||
onView(withText(toastText))
|
||||
.inRoot(withDecorView(not(`is`(mActivityTestRule.activity.window.decorView))))
|
||||
.check(matches(isDisplayed()))
|
||||
}
|
||||
|
||||
private fun childAtPosition(
|
||||
parentMatcher: Matcher<View>, position: Int
|
||||
): Matcher<View> {
|
||||
|
||||
return object : TypeSafeMatcher<View>() {
|
||||
override fun describeTo(description: Description) {
|
||||
description.appendText("Child at position $position in parent ")
|
||||
parentMatcher.describeTo(description)
|
||||
}
|
||||
|
||||
public override fun matchesSafely(view: View): Boolean {
|
||||
val parent = view.parent
|
||||
return parent is ViewGroup && parentMatcher.matches(parent)
|
||||
&& view == parent.getChildAt(position)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
29
app/src/main/AndroidManifest.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.example.h_mal.sliidenewsreader">
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
<application
|
||||
android:name=".AppClass"
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme">
|
||||
<activity
|
||||
android:name=".ui.login.LoginActivity"
|
||||
android:label="@string/title_activity_login">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
<activity android:name=".ui.main.MainActivity"></activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.example.h_mal.sliidenewsreader
|
||||
|
||||
import android.app.Application
|
||||
import com.example.h_mal.sliidenewsreader.data.repositories.Repository
|
||||
import com.example.h_mal.sliidenewsreader.data.db.AppDatabase
|
||||
import com.example.h_mal.sliidenewsreader.data.network.MyApi
|
||||
import com.example.h_mal.sliidenewsreader.data.network.NetworkConnectionInterceptor
|
||||
import com.example.h_mal.sliidenewsreader.ui.login.LoginViewModelFactory
|
||||
import com.example.h_mal.sliidenewsreader.ui.main.MainViewModelFactory
|
||||
import org.kodein.di.Kodein
|
||||
import org.kodein.di.KodeinAware
|
||||
import org.kodein.di.android.x.androidXModule
|
||||
import org.kodein.di.generic.bind
|
||||
import org.kodein.di.generic.instance
|
||||
import org.kodein.di.generic.provider
|
||||
import org.kodein.di.generic.singleton
|
||||
|
||||
class AppClass : Application(), KodeinAware{
|
||||
|
||||
override val kodein = Kodein.lazy {
|
||||
import(androidXModule(this@AppClass))
|
||||
|
||||
bind() from singleton { AppDatabase(instance()) }
|
||||
bind() from singleton { NetworkConnectionInterceptor(instance()) }
|
||||
bind() from singleton { MyApi(instance()) }
|
||||
bind() from singleton { Repository(instance(),instance()) }
|
||||
bind() from provider { LoginViewModelFactory(instance()) }
|
||||
bind() from provider { MainViewModelFactory(instance()) }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.db
|
||||
|
||||
import android.content.Context
|
||||
import androidx.room.Database
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import com.example.h_mal.sliidenewsreader.data.db.entities.User
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Database(
|
||||
entities = [User::class],
|
||||
version = 1
|
||||
)
|
||||
abstract class AppDatabase : RoomDatabase(){
|
||||
|
||||
abstract fun getUserDao(): UserDao
|
||||
// abstract fun getCurrentUserDao(): CurrentUserDao
|
||||
// abstract fun getWidgetDao(): WidgetDao
|
||||
|
||||
companion object {
|
||||
|
||||
@Volatile
|
||||
private var instance: AppDatabase? = null
|
||||
private val LOCK = Any()
|
||||
|
||||
operator fun invoke(context: Context) = instance ?: synchronized(LOCK) {
|
||||
instance ?: buildDatabase(context).also {
|
||||
instance = it
|
||||
CoroutineScope(Dispatchers.Default).launch {
|
||||
it.getUserDao().initiateUsers()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun buildDatabase(context: Context) =
|
||||
Room.databaseBuilder(
|
||||
context.applicationContext,
|
||||
AppDatabase::class.java,
|
||||
"MyDatabase.db"
|
||||
).allowMainThreadQueries().build()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.db
|
||||
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.room.*
|
||||
import com.example.h_mal.sliidenewsreader.data.db.entities.User
|
||||
|
||||
@Dao
|
||||
interface UserDao {
|
||||
|
||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
||||
suspend fun upsert(user: User) : Long
|
||||
|
||||
@Query("SELECT * FROM User" )
|
||||
fun getAllUsers() : Array<User>
|
||||
|
||||
@Query("SELECT * FROM User WHERE username = (:un) AND password = (:pw) LIMIT 1" )
|
||||
fun getUser(un: String, pw: String) : User?
|
||||
|
||||
@Query("UPDATE User SET state = 1 WHERE username = (:un)" )
|
||||
fun trueLoginState(un: String) : Int
|
||||
|
||||
@Query("UPDATE User SET state = 0 WHERE username = (:un)" )
|
||||
fun falseLoginState(un: String) : Int
|
||||
|
||||
@Query("SELECT * FROM User WHERE state = 1 LIMIT 1" )
|
||||
fun getCurrentLoginUser() : LiveData<User?>
|
||||
|
||||
@Query("SELECT role FROM User WHERE state = 1 LIMIT 1" )
|
||||
fun getCurrentRole() : String
|
||||
|
||||
@Transaction
|
||||
suspend fun initiateUsers(){
|
||||
val u1 = User("premium","password","PREMIUM", false)
|
||||
val u2 = User("user","password","NORMAL", false)
|
||||
val u3 = User("user1","password","NORMAL", false)
|
||||
|
||||
upsert(u1)
|
||||
upsert(u2)
|
||||
upsert(u3)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.db.entities
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity
|
||||
data class User(
|
||||
@PrimaryKey
|
||||
val username: String,
|
||||
val password: String,
|
||||
val role: String,
|
||||
val state: Boolean
|
||||
)
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.models
|
||||
|
||||
data class Image (
|
||||
val id : Int?,
|
||||
val url: String?
|
||||
)
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.network
|
||||
|
||||
import com.example.h_mal.sliidenewsreader.data.network.responses.FeedResponse
|
||||
|
||||
import okhttp3.OkHttpClient
|
||||
import retrofit2.Response
|
||||
import retrofit2.Retrofit
|
||||
import retrofit2.converter.gson.GsonConverterFactory
|
||||
import retrofit2.http.GET
|
||||
|
||||
interface MyApi {
|
||||
|
||||
|
||||
@GET("feed")
|
||||
suspend fun getFeed() : Response<MutableList<FeedResponse>>
|
||||
|
||||
companion object{
|
||||
operator fun invoke(
|
||||
networkConnectionInterceptor: NetworkConnectionInterceptor
|
||||
) : MyApi{
|
||||
|
||||
val okkHttpclient = OkHttpClient.Builder()
|
||||
.addInterceptor(networkConnectionInterceptor)
|
||||
.build()
|
||||
|
||||
return Retrofit.Builder()
|
||||
.client(okkHttpclient)
|
||||
.baseUrl("https://private-9e5bb4-ivorsliide.apiary-mock.com/")
|
||||
.addConverterFactory(GsonConverterFactory.create())
|
||||
.build()
|
||||
.create(MyApi::class.java)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.network
|
||||
|
||||
import android.content.Context
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.NetworkCapabilities
|
||||
import okhttp3.Interceptor
|
||||
import okhttp3.Response
|
||||
import java.io.IOException
|
||||
|
||||
class NetworkConnectionInterceptor(
|
||||
context: Context
|
||||
) : Interceptor {
|
||||
|
||||
private val applicationContext = context.applicationContext
|
||||
|
||||
override fun intercept(chain: Interceptor.Chain): Response {
|
||||
if (!isInternetAvailable())
|
||||
throw IOException("Make sure you have an active data connection")
|
||||
return chain.proceed(chain.request())
|
||||
}
|
||||
|
||||
private fun isInternetAvailable(): Boolean {
|
||||
var result = false
|
||||
val connectivityManager =
|
||||
applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
|
||||
connectivityManager?.let {
|
||||
it.getNetworkCapabilities(connectivityManager.activeNetwork)?.apply {
|
||||
result = when {
|
||||
hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
|
||||
hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.network
|
||||
|
||||
import org.json.JSONException
|
||||
import org.json.JSONObject
|
||||
import retrofit2.Response
|
||||
import java.io.IOException
|
||||
|
||||
abstract class SafeApiRequest {
|
||||
|
||||
suspend fun<T: Any> apiRequest(call: suspend () -> Response<T>) : T{
|
||||
val response = call.invoke()
|
||||
if(response.isSuccessful){
|
||||
return response.body()!!
|
||||
}else{
|
||||
val error = response.errorBody()?.string()
|
||||
|
||||
val message = StringBuilder()
|
||||
error?.let{
|
||||
try{
|
||||
message.append(JSONObject(it).getString("message"))
|
||||
}catch(e: JSONException){ }
|
||||
message.append("\n")
|
||||
}
|
||||
message.append("Error Code: ${response.code()}")
|
||||
throw IOException(message.toString())
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.network.responses
|
||||
|
||||
import com.example.h_mal.sliidenewsreader.data.models.Image
|
||||
|
||||
|
||||
data class FeedResponse (
|
||||
val id: Int?,
|
||||
val datatype: String?,
|
||||
val type: String?,
|
||||
val title: String?,
|
||||
val description: String?,
|
||||
val url: String?,
|
||||
val images: List<Image>?
|
||||
)
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.example.h_mal.sliidenewsreader.data.repositories
|
||||
|
||||
import com.example.h_mal.sliidenewsreader.data.db.AppDatabase
|
||||
import com.example.h_mal.sliidenewsreader.data.network.MyApi
|
||||
import com.example.h_mal.sliidenewsreader.data.network.SafeApiRequest
|
||||
import com.example.h_mal.sliidenewsreader.data.network.responses.FeedResponse
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
|
||||
class Repository(
|
||||
private val db: AppDatabase,
|
||||
private val api: MyApi
|
||||
) : SafeApiRequest() {
|
||||
|
||||
fun attemptUser(username: String, password: String) = db.getUserDao().getUser(username,password)
|
||||
|
||||
fun setUserLoggedIn(username: String) = db.getUserDao().trueLoginState(username)
|
||||
|
||||
fun setUserLoggedOut(username: String) = db.getUserDao().falseLoginState(username)
|
||||
|
||||
fun getUser() = db.getUserDao().getCurrentLoginUser()
|
||||
|
||||
fun getCurrentUserRole() = db.getUserDao().getCurrentRole()
|
||||
|
||||
suspend fun fetchData(): MutableList<FeedResponse>? {
|
||||
val response = apiRequest { api.getFeed() }
|
||||
|
||||
val remover = removeFinder()
|
||||
response.removeIf { item ->
|
||||
item.id == null || item.datatype == remover
|
||||
}
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
fun removeFinder() : String{
|
||||
val role = getCurrentUserRole()
|
||||
return if (role == "PREMIUM"){
|
||||
"ADS"
|
||||
}else{
|
||||
"PREMIUM_NEWS"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui
|
||||
|
||||
interface CompletionListener {
|
||||
fun onStarted()
|
||||
fun onSuccess()
|
||||
fun onFailure(message: String)
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.login
|
||||
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.databinding.DataBindingUtil
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.example.h_mal.sliidenewsreader.ui.main.MainActivity
|
||||
import com.example.h_mal.sliidenewsreader.R
|
||||
import com.example.h_mal.sliidenewsreader.data.db.entities.User
|
||||
import com.example.h_mal.sliidenewsreader.databinding.ActivityLoginBinding
|
||||
import com.example.h_mal.sliidenewsreader.ui.CompletionListener
|
||||
import kotlinx.android.synthetic.main.activity_login.*
|
||||
import org.kodein.di.KodeinAware
|
||||
import org.kodein.di.android.kodein
|
||||
import org.kodein.di.generic.instance
|
||||
|
||||
class LoginActivity : AppCompatActivity(),
|
||||
CompletionListener, KodeinAware {
|
||||
|
||||
override val kodein by kodein()
|
||||
private val factory : LoginViewModelFactory by instance()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
val binding: ActivityLoginBinding = DataBindingUtil.setContentView(this, R.layout.activity_login)
|
||||
|
||||
val loginViewModel: LoginViewModel = ViewModelProviders.of(this, factory)
|
||||
.get(LoginViewModel::class.java)
|
||||
binding.viewmodel = loginViewModel
|
||||
|
||||
loginViewModel.authListener = this
|
||||
|
||||
loginViewModel.getCurrentLoggedInUser().observe(this@LoginActivity, Observer { user ->
|
||||
|
||||
if(user != null){
|
||||
Intent(this, MainActivity::class.java).also {
|
||||
it.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
|
||||
startActivity(it)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
override fun onStarted() {
|
||||
progress_bar.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
override fun onSuccess() {
|
||||
progress_bar.visibility = View.GONE
|
||||
}
|
||||
|
||||
override fun onFailure(message: String) {
|
||||
Toast.makeText(applicationContext, message, Toast.LENGTH_SHORT).show()
|
||||
progress_bar.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.login
|
||||
|
||||
import android.view.View
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.h_mal.sliidenewsreader.R
|
||||
import com.example.h_mal.sliidenewsreader.data.repositories.Repository
|
||||
import com.example.h_mal.sliidenewsreader.ui.CompletionListener
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.lang.Exception
|
||||
|
||||
class LoginViewModel(
|
||||
private val repository: Repository
|
||||
) : ViewModel() {
|
||||
|
||||
var name: String? = null
|
||||
var password: String? = null
|
||||
|
||||
var authListener: CompletionListener? = null
|
||||
|
||||
fun getCurrentLoggedInUser() = repository.getUser()
|
||||
|
||||
|
||||
fun onLoginButtonClick(view: View){
|
||||
authListener?.onStarted()
|
||||
if(name.isNullOrEmpty() || password.isNullOrEmpty()){
|
||||
authListener?.onFailure(view.context.getString(R.string.login_invalid))
|
||||
return
|
||||
}
|
||||
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
try {
|
||||
|
||||
val user = repository.attemptUser(name!!, password!!)
|
||||
|
||||
user?.let {
|
||||
withContext(Dispatchers.Main){
|
||||
authListener?.onSuccess()
|
||||
}
|
||||
|
||||
repository.setUserLoggedIn(name!!)
|
||||
return@launch
|
||||
}
|
||||
|
||||
withContext(Dispatchers.Main){
|
||||
authListener?.onFailure(view.context.getString(R.string.login_failed))
|
||||
}
|
||||
|
||||
}catch(e: Exception){
|
||||
withContext(Dispatchers.Main){
|
||||
authListener?.onFailure(e.message!!)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.login
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import com.example.h_mal.sliidenewsreader.data.repositories.Repository
|
||||
|
||||
/**
|
||||
* ViewModel provider factory to instantiate LoginViewModel.
|
||||
* Required given LoginViewModel has a non-empty constructor
|
||||
*/
|
||||
class LoginViewModelFactory(
|
||||
private val repository: Repository
|
||||
) : ViewModelProvider.Factory {
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T : ViewModel> create(modelClass: Class<T>): T {
|
||||
return LoginViewModel(repository) as T
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.main
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.ImageView
|
||||
import android.widget.SeekBar
|
||||
import android.widget.SeekBar.OnSeekBarChangeListener
|
||||
import com.example.h_mal.sliidenewsreader.R
|
||||
import com.example.h_mal.sliidenewsreader.data.network.responses.FeedResponse
|
||||
import com.squareup.picasso.Picasso
|
||||
import kotlinx.android.synthetic.main.feed_item.view.*
|
||||
|
||||
|
||||
class ListAdapter(context: Context, objects: MutableList<FeedResponse>) :
|
||||
ArrayAdapter<FeedResponse>(context, 0, objects) {
|
||||
|
||||
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
|
||||
var view: View? = convertView
|
||||
if (view == null) {
|
||||
view = LayoutInflater.from(context).inflate(R.layout.feed_item, null)!!
|
||||
}
|
||||
|
||||
val currentFeedItem = getItem(position)
|
||||
|
||||
view.textView.text = currentFeedItem?.title
|
||||
|
||||
val slider = view.seekBar
|
||||
val imageView = view.imageView
|
||||
|
||||
slider.visibility = View.GONE
|
||||
imageView.visibility = View.GONE
|
||||
|
||||
val imgArray = currentFeedItem?.images
|
||||
|
||||
imgArray?.let {
|
||||
imageView.visibility = View.VISIBLE
|
||||
it[0].url?.apply {
|
||||
displayImage(this,imageView)
|
||||
}
|
||||
|
||||
val count = it.count() -1
|
||||
|
||||
if (count > 0){
|
||||
slider.visibility = View.VISIBLE
|
||||
slider.max = count
|
||||
slider.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
|
||||
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {}
|
||||
override fun onStartTrackingTouch(seekBar: SeekBar) {}
|
||||
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
||||
it[seekBar.progress].url?.let {url ->
|
||||
displayImage(url,view.imageView)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
return view
|
||||
}
|
||||
|
||||
fun displayImage(url: String, imageView: ImageView){
|
||||
Picasso.get()
|
||||
.load(url)
|
||||
.placeholder(R.mipmap.ic_launcher)
|
||||
.resize(250, 250)
|
||||
.centerCrop()
|
||||
.into(imageView)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.main
|
||||
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.example.h_mal.sliidenewsreader.R
|
||||
import com.example.h_mal.sliidenewsreader.data.db.entities.User
|
||||
import com.example.h_mal.sliidenewsreader.data.network.responses.FeedResponse
|
||||
import com.example.h_mal.sliidenewsreader.ui.CompletionListener
|
||||
import com.example.h_mal.sliidenewsreader.ui.login.LoginActivity
|
||||
import com.xwray.groupie.GroupAdapter
|
||||
import com.xwray.groupie.ViewHolder
|
||||
import kotlinx.android.synthetic.main.activity_login.*
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.activity_main.progress_bar
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import org.kodein.di.KodeinAware
|
||||
import org.kodein.di.android.kodein
|
||||
import org.kodein.di.generic.instance
|
||||
|
||||
class MainActivity : AppCompatActivity(), KodeinAware, CompletionListener {
|
||||
|
||||
override val kodein by kodein()
|
||||
private val factory : MainViewModelFactory by instance()
|
||||
|
||||
lateinit var viewModel: MainViewModel
|
||||
|
||||
private var currentUser: User? = null
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
|
||||
viewModel = ViewModelProviders.of(this,factory).get(MainViewModel::class.java)
|
||||
viewModel.completionLister = this
|
||||
|
||||
viewModel.setList()
|
||||
|
||||
viewModel.feed.observe(this, Observer {
|
||||
val adapter = ListAdapter(this,it)
|
||||
list_view.adapter = adapter
|
||||
})
|
||||
|
||||
|
||||
viewModel.getCurrentLoggedInUser().observe(this, Observer {user ->
|
||||
if (user != null){
|
||||
currentUser = user
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
//create a menu to navigate to other activities
|
||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||
menuInflater.inflate(R.menu.menu, menu)
|
||||
|
||||
return super.onCreateOptionsMenu(menu)
|
||||
}
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem?): Boolean {
|
||||
when (item?.itemId){
|
||||
R.id.sign_out ->{
|
||||
viewModel.logOut(currentUser)
|
||||
Intent(this@MainActivity, LoginActivity::class.java).also {
|
||||
it.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
|
||||
startActivity(it)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return super.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
override fun onStarted() {
|
||||
progress_bar.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
override fun onSuccess() {
|
||||
progress_bar.visibility = View.GONE
|
||||
}
|
||||
|
||||
override fun onFailure(message: String) {
|
||||
Toast.makeText(applicationContext, message, Toast.LENGTH_SHORT).show()
|
||||
progress_bar.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.main
|
||||
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.h_mal.sliidenewsreader.data.db.entities.User
|
||||
import com.example.h_mal.sliidenewsreader.data.network.responses.FeedResponse
|
||||
import com.example.h_mal.sliidenewsreader.data.repositories.Repository
|
||||
import com.example.h_mal.sliidenewsreader.ui.CompletionListener
|
||||
import kotlinx.coroutines.*
|
||||
import java.io.IOException
|
||||
|
||||
class MainViewModel(
|
||||
private val repository: Repository
|
||||
) : ViewModel() {
|
||||
|
||||
fun getCurrentLoggedInUser() = repository.getUser()
|
||||
|
||||
var completionLister : CompletionListener? = null
|
||||
|
||||
val feed = MutableLiveData<MutableList<FeedResponse>>()
|
||||
|
||||
fun setList(){
|
||||
completionLister?.onStarted()
|
||||
|
||||
CoroutineScope(Dispatchers.Main).launch {
|
||||
try {
|
||||
val feedResponse = repository.fetchData()
|
||||
|
||||
feedResponse?.let {
|
||||
completionLister?.onSuccess()
|
||||
feed.value = it
|
||||
return@launch
|
||||
}
|
||||
|
||||
completionLister?.onFailure("Failed to retrieve data")
|
||||
}catch(e: IOException){
|
||||
completionLister?.onFailure(e.message!!)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fun logOut(user: User?){
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
user?.username?.let {
|
||||
repository.setUserLoggedOut(it)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.main
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import com.example.h_mal.sliidenewsreader.data.repositories.Repository
|
||||
|
||||
/**
|
||||
* ViewModel provider factory to instantiate LoginViewModel.
|
||||
* Required given LoginViewModel has a non-empty constructor
|
||||
*/
|
||||
class MainViewModelFactory(
|
||||
private val repository: Repository
|
||||
) : ViewModelProvider.Factory {
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T : ViewModel> create(modelClass: Class<T>): T {
|
||||
return MainViewModel(repository) as T
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
package com.example.h_mal.sliidenewsreader.ui.main
|
||||
|
||||
34
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
Normal file
@@ -0,0 +1,34 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
|
||||
android:strokeWidth="1"
|
||||
android:strokeColor="#00000000">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:endX="78.5885"
|
||||
android:endY="90.9159"
|
||||
android:startX="48.7653"
|
||||
android:startY="61.0927"
|
||||
android:type="linear">
|
||||
<item
|
||||
android:color="#44000000"
|
||||
android:offset="0.0" />
|
||||
<item
|
||||
android:color="#00000000"
|
||||
android:offset="1.0" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
|
||||
android:strokeWidth="1"
|
||||
android:strokeColor="#00000000" />
|
||||
</vector>
|
||||
170
app/src/main/res/drawable/ic_launcher_background.xml
Normal file
@@ -0,0 +1,170 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillColor="#008577"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M9,0L9,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,0L19,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,0L29,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,0L39,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,0L49,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,0L59,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,0L69,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,0L79,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M89,0L89,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M99,0L99,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,9L108,9"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,19L108,19"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,29L108,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,39L108,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,49L108,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,59L108,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,69L108,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,79L108,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,89L108,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,99L108,99"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,29L89,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,39L89,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,49L89,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,59L89,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,69L89,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,79L89,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,19L29,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,19L39,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,19L49,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,19L59,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,19L69,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,19L79,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
</vector>
|
||||
88
app/src/main/res/layout/activity_login.xml
Normal file
@@ -0,0 +1,88 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<data>
|
||||
<variable
|
||||
name="viewmodel"
|
||||
type="com.example.h_mal.sliidenewsreader.ui.login.LoginViewModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
tools:context=".ui.login.LoginActivity">
|
||||
<EditText
|
||||
android:id="@+id/username"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginTop="96dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:text="@={viewmodel.name}"
|
||||
android:hint="@string/prompt_email"
|
||||
android:inputType="textEmailAddress"
|
||||
android:selectAllOnFocus="true"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/password"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:text="@={viewmodel.password}"
|
||||
android:hint="@string/prompt_password"
|
||||
android:imeActionLabel="@string/action_sign_in_short"
|
||||
android:imeOptions="actionDone"
|
||||
android:inputType="textPassword"
|
||||
android:selectAllOnFocus="true"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/username" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/login"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="start"
|
||||
android:layout_marginStart="48dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="48dp"
|
||||
android:layout_marginBottom="64dp"
|
||||
android:text="@string/action_sign_in_short"
|
||||
android:onClick="@{viewmodel::onLoginButtonClick}"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/password"
|
||||
app:layout_constraintVertical_bias="0.2" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress_bar"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="32dp"
|
||||
android:layout_marginTop="64dp"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginBottom="64dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/password"
|
||||
app:layout_constraintStart_toStartOf="@+id/password"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.3" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
</layout>
|
||||
22
app/src/main/res/layout/activity_main.xml
Normal file
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.main.MainActivity">
|
||||
|
||||
<ListView
|
||||
android:id="@+id/list_view"
|
||||
tools:listitem="@layout/feed_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<ProgressBar
|
||||
android:layout_gravity="center_horizontal|center_vertical"
|
||||
android:id="@+id/progress_bar"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</FrameLayout>
|
||||
25
app/src/main/res/layout/feed_item.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="TextView" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
tools:srcCompat="@mipmap/ic_launcher" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seekBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
7
app/src/main/res/menu/menu.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:id="@+id/sign_out"
|
||||
android:title="@string/action_sign_out" />
|
||||
</menu>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
||||
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 4.4 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 6.7 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
6
app/src/main/res/values/colors.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#008577</color>
|
||||
<color name="colorPrimaryDark">#00574B</color>
|
||||
<color name="colorAccent">#D81B60</color>
|
||||
</resources>
|
||||
5
app/src/main/res/values/dimens.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
</resources>
|
||||
15
app/src/main/res/values/strings.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<resources>
|
||||
<string name="app_name">Sliide news reader</string>
|
||||
<string name="title_activity_login">Sign in</string>
|
||||
<string name="prompt_email">Email</string>
|
||||
<string name="prompt_password">Password</string>
|
||||
<string name="action_sign_in">Sign in or register</string>
|
||||
<string name="action_sign_in_short">Sign in</string>
|
||||
<string name="action_sign_out">Sign out</string>
|
||||
<string name="welcome">"Welcome !"</string>
|
||||
<string name="invalid_username">Not a valid username</string>
|
||||
<string name="invalid_password">Password must be >5 characters</string>
|
||||
<string name="login_invalid">"Invalid username or password"</string>
|
||||
<string name="login_failed">""User credentials incorrect""</string>
|
||||
|
||||
</resources>
|
||||
11
app/src/main/res/values/styles.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.example.h_mal.sliidenewsreader
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
class ExampleUnitTest {
|
||||
@Test
|
||||
fun addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2)
|
||||
}
|
||||
}
|
||||