Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into SearchFragment
commit e80c38a26c13ac5e5f2379ab775287eb9b06920e
2 parents 57db91c + fddf8f8
g-ichimaru authored on 3 Oct
Showing 10 changed files
View
1
■■■■
app/src/main/java/com/example/citrusclient/Citrus.java
public Integer getCurMonth(){return curMonth;}
public Integer getCurDay(){return curDay;}
public String getCurLookingAccountId(){return curLookingAccountId;}
public Integer getCurLookingBookId(){return curLookingBookId;}
 
//setter
public void setToken(String token){
this.token = token;
}
View
54
app/src/main/java/com/example/citrusclient/rest/AccountsRest.java
package com.example.citrusclient.rest;
 
import dalvik.annotation.optimization.FastNative;
import retrofit2.Call;
import retrofit2.http.DELETE;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path;
import retrofit2.http.Query;
 
public interface AccountsRest {
 
// @FormUrlEncoded
Call<String> login(
@Path("account_id") String account_id,
@Field("password") String password
);
 
//仮
//パスワード変更
@FormUrlEncoded
@PUT("accounts/{account_id}/password")
Call<String> changePW(
@Path("account_id") String account_id,
@Field("new_password") String new_password,
@Field("old_password") String old_password,
@Field("token") String token
);
 
//仮
//アカウント削除
@FormUrlEncoded
@DELETE("accounts/{account_id}")
Call<String> deleteId(
@Path("account_id") String account_id,
@Query("token") String token,
@Query("password") String password
);
//仮
//アカウントの色を返す
@FormUrlEncoded
@GET("accounts/{account_id}/accountColor")
Call<String> getAccountColor(
@Path("account_id") String account_id
);
 
//仮
//アカウントカラー変更
@FormUrlEncoded
@PUT("accounts/{account_id}/accountColor")
Call<String> changeColor(
@Path("account_id") String account_id,
@Field("accountColor") String accountColor,
@Field("token") String token
);
 
//仮
//アカウント変更
@FormUrlEncoded
@PUT("accounts/{account_id}")
Call<String> changeAccount(
@Path("account_id") String account_id,
@Field("new_account_id") String new_account_id,
@Field("old_password") String old_password,
@Field("token") String token
);
}
View
app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java
View
app/src/main/java/com/example/citrusclient/viewmodels/SettingsViewModel.java 0 → 100644
View
app/src/main/java/com/example/citrusclient/views/CalendarFragment.java
View
app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java
View
app/src/main/java/com/example/citrusclient/views/HomeFragment.java
View
app/src/main/java/com/example/citrusclient/views/MainActivity.java
View
app/src/main/java/com/example/citrusclient/views/SignUpActivity.java
View
app/src/main/res/layout/fragment_settings.xml