feature/fetch_userinfo #85

Merged
Fujimatsu merged 35 commits from feature/fetch_userinfo into main 2024-06-24 01:36:45 +00:00
6 changed files with 4 additions and 82 deletions
Showing only changes of commit 972693e8a7 - Show all commits

View File

@ -1,7 +1,6 @@
package one.nem.kidshift;
import android.app.Application;
import android.util.Log;
import com.google.android.material.color.DynamicColors;
@ -24,13 +23,6 @@ public class KidShiftApplication extends Application {
public void onCreate() {
super.onCreate();
// if(DynamicColors.isDynamicColorAvailable()) {
// Log.d("StartUp/DynamicColors", "DynamicColors is available!");
// DynamicColors.applyToActivitiesIfAvailable(this);
// } else {
// Log.d("StartUp/DynamicColors", "DynamicColors is not available.");
// }
logger.setTag("KidShiftApplication");
logger.info("super.onCreate() completed");

View File

@ -39,7 +39,7 @@ dependencies {
annotationProcessor libs.com.google.dagger.hilt.compiler
// Java Faker
implementation 'com.github.javafaker:javafaker:1.0.2'
implementation libs.javafaker
implementation project(':model')
implementation project(':utils')

View File

@ -1,64 +0,0 @@
package one.nem.kidshift.data.impl;
import android.graphics.Color;
import javax.inject.Inject;
import dagger.Binds;
import one.nem.kidshift.data.UserSettings;
public class UserSettingsDummyImpl implements UserSettings {
@Inject
public UserSettingsDummyImpl() {
}
@Override
public UserSettings.TaskSetting getTaskSetting() {
return new TaskSettingImpl();
}
@Override
public AppCommonSetting getAppCommonSetting() {
return null;
}
@Override
public UserSettings.ApiSetting getApiSetting() {
return new ApiSettingImpl();
}
public class ApiSettingImpl implements UserSettings.ApiSetting {
@Override
public String getApiBaseUrl() {
return "https://kidshift-beta.nem.one/";
}
@Override
public void setApiBaseUrl(String url) {
}
}
public class TaskSettingImpl implements UserSettings.TaskSetting {
@Override
public int getDefaultIconColor() {
return Color.parseColor("#FF0000");
}
@Override
public void setDefaultIconColor(int color) {
}
@Override
public String getDefaultIconEmoji() {
return "🤔";
}
@Override
public void setDefaultIconEmoji(String emoji) {
}
}
}

View File

@ -3,19 +3,13 @@ package one.nem.kidshift.data.modules;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.android.components.FragmentComponent;
import dagger.hilt.components.SingletonComponent;
import one.nem.kidshift.data.UserSettings;
import one.nem.kidshift.data.impl.UserSettingsDummyImpl;
import one.nem.kidshift.data.impl.UserSettingsImpl;
@Module
@InstallIn(SingletonComponent.class)
abstract public class UserSettingsDummyModule {
// @Binds
// abstract UserSettings bindUserSettings(UserSettingsDummyImpl userSettingsDummyImpl);
public abstract class UserSettingsModule {
@Binds
public abstract UserSettings bindUserSettings(UserSettingsImpl userSettingsImpl);
}

View File

@ -1,6 +1,7 @@
[versions]
agp = "8.3.2"
gson = "2.11.0"
javafaker = "1.0.2"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
@ -15,6 +16,7 @@ room = "2.5.0"
[libraries]
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
javafaker = { module = "com.github.javafaker:javafaker", version.ref = "javafaker" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

View File

@ -1,7 +1,5 @@
package one.nem.kidshift.utils;
import android.content.SharedPreferences;
import java.util.List;
public interface SharedPrefUtils {