sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-17 11:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix news display

Browse source
This commit is contained in:
Phillip Thelen 2017-11-17 14:00:31 +01:00
parent 5b0bfae1e9
commit fa2ec9aac9
9 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="1957"
android:versionCode="1958"
android:versionName="1.3"
android:screenOrientation="portrait"
android:installLocation="auto" >

3
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
View file

@ -65,6 +65,7 @@ import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsP
import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
@ -293,4 +294,6 @@ public interface AppComponent {
void inject(@NotNull BulkAllocateStatsDialog bulkAllocateStatsDialog);
void inject(@NotNull PushNotificationsPreferencesFragment pushNotificationsPreferencesFragment);
void inject(WelcomeFragment welcomeFragment);
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
View file

@ -19,8 +19,8 @@ interface TaskRepository : BaseRepository {
fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Observable<TaskList>
fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): Observable<TaskList>
fun taskChecked(user: User?, task: Task, up: Boolean, force: Boolean): Observable<TaskScoringResult>
fun taskChecked(user: User?, taskId: String, up: Boolean, force: Boolean): Observable<TaskScoringResult>
fun taskChecked(user: User?, task: Task, up: Boolean, force: Boolean): Observable<TaskScoringResult?>
fun taskChecked(user: User?, taskId: String, up: Boolean, force: Boolean): Observable<TaskScoringResult?>
fun scoreChecklistItem(taskId: String, itemId: String): Observable<Task>
fun getTask(taskId: String): Observable<Task>

6
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
View file

@ -46,10 +46,10 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
.doOnNext { res -> this.localRepository.saveTasks(userId, tasksOrder, res) }
}
override fun taskChecked(user: User?, task: Task, up: Boolean, force: Boolean): Observable<TaskScoringResult> {
override fun taskChecked(user: User?, task: Task, up: Boolean, force: Boolean): Observable<TaskScoringResult?> {
val now = Date().time
if (lastTaskAction > now - 500 && !force) {
return Observable.just(TaskScoringResult())
return Observable.just(null)
}
lastTaskAction = now
return this.apiClient.postTaskDirection(task.id, (if (up) TaskDirection.up else TaskDirection.down).toString())
@ -90,7 +90,7 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
}
}
override fun taskChecked(user: User?, taskId: String, up: Boolean, force: Boolean): Observable<TaskScoringResult> {
override fun taskChecked(user: User?, taskId: String, up: Boolean, force: Boolean): Observable<TaskScoringResult?> {
return localRepository.getTask(taskId).first()
.flatMap { task -> taskChecked(user, task, up, force) }
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
View file

@ -244,7 +244,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
}
override fun runCron(tasks: List<Task>) {
val observable: Observable<List<TaskScoringResult>> = if (tasks.isNotEmpty()) {
val observable: Observable<List<TaskScoringResult?>> = if (tasks.isNotEmpty()) {
Observable.from(tasks)
.flatMap { task -> taskRepository.taskChecked(null, task, true, true) }
.toList()

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -836,7 +836,7 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
@Override
public void onTutorialDeferred(TutorialStep step) {
step.setDisplayedOn(new Date());
taskRepository.executeTransaction(realm -> step.setDisplayedOn(new Date()));
this.removeActiveTutorialView();
}

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
View file

@ -18,14 +18,16 @@ class NewsFragment : BaseMainFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
super.onCreateView(inflater, container, savedInstanceState)
hideToolbar()
return container?.inflate(R.layout.fragment_news)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val address = if (BuildConfig.DEBUG) BuildConfig.BASE_URL else context?.getString(R.string.base_url)
val webSettings = newsWebview.getSettings()
webSettings.setJavaScriptEnabled(true)
val webSettings = newsWebview.settings
webSettings.javaScriptEnabled = true
webSettings.domStorageEnabled = true
newsWebview.webChromeClient = object : WebChromeClient() {
override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
Log.d("Habitica", consoleMessage.message() + " -- From line "
@ -37,6 +39,11 @@ class NewsFragment : BaseMainFragment() {
newsWebview.loadUrl(address + "/static/new-stuff")
}
override fun onDestroyView() {
showToolbar()
super.onDestroyView()
}
override fun injectFragment(component: AppComponent) {
component.inject(this)
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
View file

@ -52,5 +52,7 @@ public class WelcomeFragment extends BaseFragment {
}
@Override
public void injectFragment(AppComponent component) {}
public void injectFragment(AppComponent component) {
component.inject(this);
}
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.java
View file

@ -67,6 +67,9 @@ public class StarView extends AppCompatImageView {
runBlink();
}
});
animator.start();
try {
animator.start();
} catch (NullPointerException ignored) {
}
}
}