Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into booksViewModels

Fork: 0

nitta-lab-2024 / CitrusClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into booksViewModels AccountColorDialogFragment BooksAddFavoriteCount BooksRest CalendarFragment ColorChoice CorrectFavorite CreateBookActivity CreateScheduleFragment CreateTodoFragment EditSchedule FavoritesRest FavoritesViewModel GetOneBook HelpSearch HomeFragment LoginActivity MyBookshelfActivity OtherHomeFragment PublicBooksViewModel ScheduleViewModel SearchFragment Settings2 SettingsFragment TodoViewModel TodosRest View_SignUp Views_SignUp bagFixSakoda booksViewModels check citrus color favoritesFragment favoritesSakoda fixFavoritesCount master setting3 setting4 settings3 ...test-dialog
commit 33cf32d35815195a61b02856201446247d1973f9 2 parents 4758fed + bff905c g-ichimaru authored on 20 Jun

Browse code

AccountColorDialogFragment ...test-dialog

commit 33cf32d35815195a61b02856201446247d1973f9

2 parents 4758fed + bff905c

g-ichimaru authored on 20 Jun

Patch

Unified Split

Showing 4 changed files

                Ignore Space
               Show notes
              View
            
          
          7 ■■■■■
          app/src/main/java/com/example/citrusclient/Citrus.java
        
        
        
          0 → 100644
             package com.example.citrusclient;
 
import android.app.Application;
 
public class Citrus extends Application {
}
+package com.example.citrusclient;
+import android.app.Application;
+public class Citrus extends Application {
+}

Ignore Space Show notes View

■■■■■

app/src/main/java/com/example/citrusclient/models/Book.java 0 → 100644

                Ignore Space
               Show notes
              View
            
          
          26 ■■■■■
          app/src/main/java/com/example/citrusclient/rest/AccountsRest.java
             package com.example.citrusclient.rest;
 
import retrofit2.Call;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.POST;
import retrofit2.http.Path;
 
public interface AccountsRest {
 
//    @FormUrlEncoded
//    @GET("accounts")
//    Call<Void> getAllAccounts(
//
//    );
 
    @FormUrlEncoded
    @POST("accounts")
    Call<String> signup(
            @Field("account_id") String account_id,
            @Field("password") String password
    );
 
    @FormUrlEncoded
    @POST("accounts/{account_id}/login")
    Call<String> login(
            @Path("account_id") String account_id,
            @Field("password") String password
    );
}
 package com.example.citrusclient.rest;
+import retrofit2.Call;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
 public interface AccountsRest {
+//    @FormUrlEncoded
+//    @GET("accounts")
+//    Call<Void> getAllAccounts(
+//
+//    );
+    @FormUrlEncoded
+    @POST("accounts")
+    Call<String> signup(
+            @Field("account_id") String account_id,
+            @Field("password") String password
+    );
+    @FormUrlEncoded
+    @POST("accounts/{account_id}/login")
+    Call<String> login(
+            @Path("account_id") String account_id,
+            @Field("password") String password
+    );
 }

                Ignore Space
               Show notes
              View
            
          
          25 ■■■■■
          app/src/main/java/com/example/citrusclient/rest/BooksRest.java
             package com.example.citrusclient.rest;
 
import java.util.Collection;
import java.util.HashMap;
 
import retrofit2.Call;
import retrofit2.Response;
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;
 
public interface BooksRest {
 
    @GET("accounts/{account_id}/books")
    Call<Void> getBooks(
            @Path("account_id") String account_id
    );
 
    @FormUrlEncoded
    @POST("accounts/{account_id}/books")
    Call<Void> createBook(
            @Path("account_id") String account_id
 
    );
}
 package com.example.citrusclient.rest;
+import java.util.Collection;
+import java.util.HashMap;
+import retrofit2.Call;
+import retrofit2.Response;
+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;
 public interface BooksRest {
+    @GET("accounts/{account_id}/books")
+    Call<Void> getBooks(
+            @Path("account_id") String account_id
+    );
+    @FormUrlEncoded
+    @POST("accounts/{account_id}/books")
+    Call<Void> createBook(
+            @Path("account_id") String account_id
+    );
 }

Show line notes below