Procházet zdrojové kódy

[컨텐츠][New] 숫자 폰트 적용

hyodong.min před 7 roky
rodič
revize
bfef9f2adf

+ 2 - 2
app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -105,7 +105,7 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return rx single with LifeplusAPIBean
    */
   @Override
-  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+  public Single<MemberJoinResultBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
     return api().confirmMobileAuth(bean);
   }
 
@@ -127,7 +127,7 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return
    */
   @Override
-  public Single<LifeplusAPIBean> confirmMobileAuthSimple(AuthConfirmRequestBean bean) {
+  public Single<MemberJoinResultBean> confirmMobileAuthSimple(AuthConfirmRequestBean bean) {
     return api().confirmMobileAuthSimple(bean);
   }
 

binární
app/src/main/assets/font/bmyeonsung.otf


+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/TypefaceUtil.java

@@ -30,7 +30,7 @@ import kr.co.zumo.app.R;
 
 public class TypefaceUtil {
   private static final String REGULAR_FONT_ASSET_NAME = "font/droid_sans.ttf"; // in assets folder
-  private static final String MEDIUM_FONT_ASSET_NAME = "font/bmyeonsung.otf"; // in assets folder
+  private static final String MEDIUM_FONT_ASSET_NAME = "font/spoqa.ttf"; // in assets folder
 
   //  private static final String REGULAR_FONT_FILE = "/system/fonts/droid_sans.ttf"; // 사용 가능하지만 없는 유저도 있을 수 있어서 asset 에 임베딩
 
@@ -45,7 +45,7 @@ public class TypefaceUtil {
 //      Typeface regular = createFont(context, REGULAR_FONT_ASSET_NAME);
 //      Typeface medium = createFont(context, MEDIUM_FONT_ASSET_NAME);
       Typeface regular = ResourcesCompat.getFont(context, R.font.droid_sans);
-//      Typeface medium = ResourcesCompat.getFont(context, R.font.bmyeonsung);
+//      Typeface medium = ResourcesCompat.getFont(context, R.font.spoqa);
 
       Map<String, Typeface> fonts = new HashMap<>();
       fonts.put(context.getString(R.string.lifeplus_font_sans_serif), regular);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthView.java

@@ -150,7 +150,7 @@ public class MobileAuthView extends ConstraintLayout implements IMobileAuthContr
       checkBoxAllDriver.applyCheckAll(b);
       presenter.onAllAgreeCheckedChanged(b);
     });
-//    checkBoxAllAgree.setTypeface(ResourcesCompat.getFont(context, R.font.font1));
+//    checkBoxAllAgree.setTypeface(ResourcesCompat.getFont(context, R.font.font_droid_sans));
 
     // 약관 동의
     int len = 4;
@@ -165,7 +165,7 @@ public class MobileAuthView extends ConstraintLayout implements IMobileAuthContr
         checkBoxAllDriver.check();
         presenter.onAgreeCheckedChanged(index, b);
       });
-//      checkBox.setTypeface(ResourcesCompat.getFont(context, R.font.font1));
+//      checkBox.setTypeface(ResourcesCompat.getFont(context, R.font.font_droid_sans));
 
       button = findViewById(ResourceUtil.getId("button_identify_agree" + (i + 1)));
       button.setOnClickListener(v1 -> {

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeFragment.java

@@ -142,7 +142,7 @@ public class SignUpAgreeFragment extends FragmentBase<SignUpAgreePresenter> impl
     buttonAgree.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.SUCCESS).build());
     });
-//    checkBoxAll.setTypeface(ResourcesCompat.getFont(getContext(), R.font.font1));
+//    checkBoxAll.setTypeface(ResourcesCompat.getFont(getContext(), R.font.font_droid_sans));
   }
 
   @Override
@@ -177,7 +177,7 @@ public class SignUpAgreeFragment extends FragmentBase<SignUpAgreePresenter> impl
         checkBoxAllDriver.check();
         notifyAgreeChanged();
       });
-//      checkBox.setTypeface(ResourcesCompat.getFont(getContext(), R.font.font1));
+//      checkBox.setTypeface(ResourcesCompat.getFont(getContext(), R.font.font_droid_sans));
       view = itemView.findViewById(R.id.agree_detail_button);
       view.setOnClickListener(v -> {
         notifyDetailPressed(index, bean.toJson());

binární
app/src/main/res/font/bmyeonsung.otf


app/src/main/res/font/font1.xml → app/src/main/res/font/font_droid_sans.xml


+ 6 - 6
app/src/main/res/font/font2.xml

@@ -4,28 +4,28 @@
 
   <!-- normal -->
   <font
-    android:font="@font/bmyeonsung"
+    android:font="@font/spoqa"
     android:fontStyle="normal"
     android:fontWeight="400"
-    app:font="@font/bmyeonsung"
+    app:font="@font/spoqa"
     app:fontStyle="normal"
     app:fontWeight="400"/>
 
   <!-- italic -->
   <font
-    android:font="@font/bmyeonsung"
+    android:font="@font/spoqa"
     android:fontStyle="italic"
     android:fontWeight="400"
-    app:font="@font/bmyeonsung"
+    app:font="@font/spoqa"
     app:fontStyle="italic"
     app:fontWeight="400"/>
 
   <!-- bold -->
   <font
-    android:font="@font/bmyeonsung"
+    android:font="@font/spoqa"
     android:fontStyle="normal"
     android:fontWeight="700"
-    app:font="@font/bmyeonsung"
+    app:font="@font/spoqa"
     app:fontStyle="normal"
     app:fontWeight="700"/>
 </font-family>

binární
app/src/main/res/font/spoqa.ttf


+ 1 - 0
app/src/main/res/layout/custom_listicle_image_view.xml

@@ -98,6 +98,7 @@
     android:textSize="26dp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_title"
     app:layout_constraintStart_toStartOf="parent"
+    android:fontFamily="@font/spoqa"
     tools:text="05"
     tools:textColor="@color/C000000"/>
 

+ 1 - 1
app/src/main/res/values/styles.xml

@@ -25,7 +25,7 @@
     <item name="android:windowLightStatusBar">true</item>
 
     <!--<item name="android:windowFullscreen">true</item>-->
-    <!--<item name="android:fontFamily">@font/font1</item>--> <!-- Toast 에 적용이 안된다. -->
+    <!--<item name="android:fontFamily">@font/font_droid_sans</item>--> <!-- Toast 에 적용이 안된다. -->
     <item name="customSwitchStyle">@style/OnOffSwitch</item>
   </style>